auto merge of #581 : alexcrichton/cargo/manpage, r=brson
authorbors <bors@rust-lang.org>
Tue, 16 Sep 2014 17:43:43 +0000 (17:43 +0000)
committerbors <bors@rust-lang.org>
Tue, 16 Sep 2014 17:43:43 +0000 (17:43 +0000)
Closes #578


Trivial merge